Merge ~ines-almeida/launchpad:update-copyright-date-across-launchpad into launchpad:master

Proposed by Ines Almeida
Status: Merged
Approved by: Ines Almeida
Approved revision: e882cc9b90a0c7771bc8f0057a23c7ab1cd4937b
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~ines-almeida/launchpad:update-copyright-date-across-launchpad
Merge into: launchpad:master
Diff against target: 210 lines (+17/-17)
16 files modified
LICENSE (+1/-1)
doc/conf.py (+1/-1)
lib/lp/app/stories/basics/copyright.rst (+2/-2)
lib/lp/app/templates/base-layout-macros.pt (+1/-1)
lib/lp/app/tour/api (+1/-1)
lib/lp/app/tour/branch-hosting-tracking (+1/-1)
lib/lp/app/tour/bugs (+1/-1)
lib/lp/app/tour/community (+1/-1)
lib/lp/app/tour/community-support (+1/-1)
lib/lp/app/tour/feature-tracking (+1/-1)
lib/lp/app/tour/index (+1/-1)
lib/lp/app/tour/join-launchpad (+1/-1)
lib/lp/app/tour/ppa (+1/-1)
lib/lp/app/tour/release-management (+1/-1)
lib/lp/app/tour/translation (+1/-1)
lib/lp/services/librarianserver/web.py (+1/-1)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+460944@code.launchpad.net

This proposal supersedes a proposal from 2024-02-21.

Commit message

Remove date range from copyright note in user-facing places

This is no longer necessary and only creates extra work once a year. Canonical's legal team agreed with having the start year, but not the range.
Blog post about this topic: https://hynek.me/til/copyright-years/

Description of the change

Note that in this MP we are not updating the copyright message in every code file, only the ones more user facing.

Discussion about this topic: https://chat.canonical.com/canonical/pl/e1tmfeisftf9zyhqwqnyzfg8do
Blog post about this topic: https://hynek.me/til/copyright-years/

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) wrote :

Your commit message tells the what, but not the why. Could you please add a reason why we do this? If you could find a link to the discussion we had would be awesome (to this MP, not to the commit message). I think there were also a couple of blog posts out there discussing why this makes sense.

Uh, that is what I call a massive pull request...
https://github.com/curl/curl/pull/10205/files

And the blog post I mentioned was
https://hynek.me/til/copyright-years/

I think it would make sense to add it to the commit message, I am pretty sure Guruprasad mentioned it in the discussion we had back then.

Revision history for this message
Ines Almeida (ines-almeida) wrote :

Updated as requested. Unfortunatelly, some of the blog posts initially linked are no longer available. But I believe the explanation + knowing this was agreed with the legal team should suffice.

Revision history for this message
Jürgen Gmach (jugmac00) wrote :

Unfortunately, it is not enough to update the commit message in the web UI, you would need to update it also in the git tree so we can easily comprehend in case we need to reconstruct why we did it in the past. Unfortunately, there is no link between a git commit and the MP in Launchpad.

You need to update the git commit message locally, and do a force-push to your branch.

review: Approve
Revision history for this message
Ines Almeida (ines-almeida) wrote :

Updated :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/LICENSE b/LICENSE
index 2f2a36e..30edbc5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
1Launchpad is Copyright 2004-2023 Canonical Ltd.1Launchpad is Copyright 2004 Canonical Ltd.
22
3Canonical Ltd ("Canonical") distributes the Launchpad source code3Canonical Ltd ("Canonical") distributes the Launchpad source code
4under the GNU Affero General Public License, version 3 ("AGPLv3").4under the GNU Affero General Public License, version 3 ("AGPLv3").
diff --git a/doc/conf.py b/doc/conf.py
index 3f6130a..d2e3538 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -38,7 +38,7 @@ master_doc = "index"
3838
39# General information about the project.39# General information about the project.
40project = "Launchpad"40project = "Launchpad"
41copyright = "2004-2023, Canonical Ltd."41copyright = "2004 Canonical Ltd."
4242
43# The version info for the project you're documenting, acts as replacement for43# The version info for the project you're documenting, acts as replacement for
44# |version| and |release|, also used in various other places throughout the44# |version| and |release|, also used in various other places throughout the
diff --git a/lib/lp/app/stories/basics/copyright.rst b/lib/lp/app/stories/basics/copyright.rst
index 650ed8f..e0952d4 100644
--- a/lib/lp/app/stories/basics/copyright.rst
+++ b/lib/lp/app/stories/basics/copyright.rst
@@ -9,11 +9,11 @@ The tour pages.
9 ... find_tag_by_id(browser.contents, "footer-navigation")9 ... find_tag_by_id(browser.contents, "footer-navigation")
10 ... )10 ... )
11 ... )11 ... )
12 Next...© 2004-2023 Canonical Ltd...12 Next...© 2004 Canonical Ltd...
1313
14The main template.14The main template.
1515
16 >>> browser.open("http://launchpad.test")16 >>> browser.open("http://launchpad.test")
17 >>> print(extract_text(find_tag_by_id(browser.contents, "footer")))17 >>> print(extract_text(find_tag_by_id(browser.contents, "footer")))
18 © 2004-2023 Canonical Ltd.18 © 2004 Canonical Ltd.
19 ...19 ...
diff --git a/lib/lp/app/templates/base-layout-macros.pt b/lib/lp/app/templates/base-layout-macros.pt
index e9c2b1d..b812b42 100644
--- a/lib/lp/app/templates/base-layout-macros.pt
+++ b/lib/lp/app/templates/base-layout-macros.pt
@@ -285,7 +285,7 @@
285 </div>285 </div>
286286
287 <div class="colophon">287 <div class="colophon">
288 &copy; 2004-2023288 &copy; 2004
289 <a href="http://canonical.com/">Canonical&nbsp;Ltd.</a>289 <a href="http://canonical.com/">Canonical&nbsp;Ltd.</a>
290 &nbsp;&bull;&nbsp;290 &nbsp;&bull;&nbsp;
291 <a tal:attributes="href string:${rooturl}legal">Terms of use</a>291 <a tal:attributes="href string:${rooturl}legal">Terms of use</a>
diff --git a/lib/lp/app/tour/api b/lib/lp/app/tour/api
index fbcf04f..f29f728 100644
--- a/lib/lp/app/tour/api
+++ b/lib/lp/app/tour/api
@@ -129,7 +129,7 @@ We've even done the hard work for you: use our LGPL Python library &mdash; <a hr
129 <a href="feature-tracking" accesskey="g" tabindex="5">Next</a>129 <a href="feature-tracking" accesskey="g" tabindex="5">Next</a>
130 </li>130 </li>
131 <li class="copyright">131 <li class="copyright">
132 &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>132 &copy; 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
133 </li>133 </li>
134 </ul>134 </ul>
135 </div>135 </div>
diff --git a/lib/lp/app/tour/branch-hosting-tracking b/lib/lp/app/tour/branch-hosting-tracking
index 4c96458..3f31618 100644
--- a/lib/lp/app/tour/branch-hosting-tracking
+++ b/lib/lp/app/tour/branch-hosting-tracking
@@ -125,7 +125,7 @@ All team members can commit to a centrally hosted branch, while anyone can still
125 <a href="translation" accesskey="g" tabindex="5" title="Read about software translation in Launchpad">Next</a>125 <a href="translation" accesskey="g" tabindex="5" title="Read about software translation in Launchpad">Next</a>
126 </li>126 </li>
127 <li class="copyright">127 <li class="copyright">
128 &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>128 &copy; 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
129 </li>129 </li>
130 </ul>130 </ul>
131 </div>131 </div>
diff --git a/lib/lp/app/tour/bugs b/lib/lp/app/tour/bugs
index 721d914..51f7044 100644
--- a/lib/lp/app/tour/bugs
+++ b/lib/lp/app/tour/bugs
@@ -132,7 +132,7 @@ And to help find low-hanging fruit, there&rsquo;s a &ldquo;Bugs fixed elsewhere&
132 <a href="branch-hosting-tracking" accesskey="g" tabindex="5" title="Read about code hosting and review in Launchpad">Next</a>132 <a href="branch-hosting-tracking" accesskey="g" tabindex="5" title="Read about code hosting and review in Launchpad">Next</a>
133 </li>133 </li>
134 <li class="copyright">134 <li class="copyright">
135 &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="i" tabindex="7">Terms of Use</a> &#124; <a href="https://help.launchpad.net/Feedback" accesskey="j" tabindex="8">Feedback</a> &#124; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="k" tabindex="9">FAQ</a>135 &copy; 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="i" tabindex="7">Terms of Use</a> &#124; <a href="https://help.launchpad.net/Feedback" accesskey="j" tabindex="8">Feedback</a> &#124; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="k" tabindex="9">FAQ</a>
136 </li>136 </li>
137 </ul>137 </ul>
138 </div>138 </div>
diff --git a/lib/lp/app/tour/community b/lib/lp/app/tour/community
index 8ab7c15..e83a5a2 100644
--- a/lib/lp/app/tour/community
+++ b/lib/lp/app/tour/community
@@ -111,7 +111,7 @@ Launchpad also helps you organise the social structure of your community with a
111 <a href="ppa" accesskey="g" tabindex="5" title="Read about building and distributing Ubuntu packages">Next</a>111 <a href="ppa" accesskey="g" tabindex="5" title="Read about building and distributing Ubuntu packages">Next</a>
112 </li>112 </li>
113 <li class="copyright">113 <li class="copyright">
114 &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>114 &copy; 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
115 </li>115 </li>
116 </ul>116 </ul>
117 </div>117 </div>
diff --git a/lib/lp/app/tour/community-support b/lib/lp/app/tour/community-support
index 3214d5e..d695675 100644
--- a/lib/lp/app/tour/community-support
+++ b/lib/lp/app/tour/community-support
@@ -104,7 +104,7 @@
104 <a href="api" tabindex="5" accesskey="g">Next</a>104 <a href="api" tabindex="5" accesskey="g">Next</a>
105 </li>105 </li>
106 <li class="copyright">106 <li class="copyright">
107 &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>107 &copy; 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
108 </li>108 </li>
109 </ul>109 </ul>
110 </div>110 </div>
diff --git a/lib/lp/app/tour/feature-tracking b/lib/lp/app/tour/feature-tracking
index b158f47..8e564d1 100644
--- a/lib/lp/app/tour/feature-tracking
+++ b/lib/lp/app/tour/feature-tracking
@@ -86,7 +86,7 @@
86 <a href="release-management" accesskey="g" tabindex="5" title="Read about managing software releases">Next</a>86 <a href="release-management" accesskey="g" tabindex="5" title="Read about managing software releases">Next</a>
87 </li>87 </li>
88 <li class="copyright">88 <li class="copyright">
89 &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>89 &copy; 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
90 </li>90 </li>
91 </ul>91 </ul>
92 </div>92 </div>
diff --git a/lib/lp/app/tour/index b/lib/lp/app/tour/index
index 793348e..d0ead68 100644
--- a/lib/lp/app/tour/index
+++ b/lib/lp/app/tour/index
@@ -172,7 +172,7 @@
172 <a href="bugs" accesskey="l" tabindex="10" title="Read about bug tracking in Launchpad">Next</a>172 <a href="bugs" accesskey="l" tabindex="10" title="Read about bug tracking in Launchpad">Next</a>
173 </li>173 </li>
174 <li class="copyright">174 <li class="copyright">
175 &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="i" tabindex="7">Terms of Use</a> &#124; <a href="https://help.launchpad.net/Feedback" accesskey="j" tabindex="8">Feedback</a> &#124; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="k" tabindex="9">FAQ</a>175 &copy; 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="i" tabindex="7">Terms of Use</a> &#124; <a href="https://help.launchpad.net/Feedback" accesskey="j" tabindex="8">Feedback</a> &#124; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="k" tabindex="9">FAQ</a>
176 </li>176 </li>
177 </ul>177 </ul>
178 </div>178 </div>
diff --git a/lib/lp/app/tour/join-launchpad b/lib/lp/app/tour/join-launchpad
index c2ecae9..6c1c1b6 100644
--- a/lib/lp/app/tour/join-launchpad
+++ b/lib/lp/app/tour/join-launchpad
@@ -107,7 +107,7 @@ Launchpad is free to use for <a href="https://help.launchpad.net/Legal/ProjectLi
107 <a href="index" title="Return to the start of the Launchpad tour" accesskey="g" tabindex="5">Start</a>107 <a href="index" title="Return to the start of the Launchpad tour" accesskey="g" tabindex="5">Start</a>
108 </li>108 </li>
109 <li class="copyright">109 <li class="copyright">
110 &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>110 &copy; 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
111 </li>111 </li>
112 </ul>112 </ul>
113 </div>113 </div>
diff --git a/lib/lp/app/tour/ppa b/lib/lp/app/tour/ppa
index d2a9f50..b1b6e7f 100644
--- a/lib/lp/app/tour/ppa
+++ b/lib/lp/app/tour/ppa
@@ -111,7 +111,7 @@
111 <a href="community-support" accesskey="g" tabindex="5">Next</a>111 <a href="community-support" accesskey="g" tabindex="5">Next</a>
112 </li>112 </li>
113 <li class="copyright">113 <li class="copyright">
114 &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>114 &copy; 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
115 </li>115 </li>
116 </ul>116 </ul>
117 </div>117 </div>
diff --git a/lib/lp/app/tour/release-management b/lib/lp/app/tour/release-management
index a6f04be..5bdfa59 100644
--- a/lib/lp/app/tour/release-management
+++ b/lib/lp/app/tour/release-management
@@ -94,7 +94,7 @@ Launchpad calls these <em>series</em> and helps you to organise your work &mdash
94 <a href="join-launchpad" title="Read about commercial features and free access to Launchpad" accesskey="g" tabindex="5" title="Read about commercial features and free access to Launchpad">Next</a>94 <a href="join-launchpad" title="Read about commercial features and free access to Launchpad" accesskey="g" tabindex="5" title="Read about commercial features and free access to Launchpad">Next</a>
95 </li>95 </li>
96 <li class="copyright">96 <li class="copyright">
97 &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>97 &copy; 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
98 </li>98 </li>
99 </ul>99 </ul>
100 </div>100 </div>
diff --git a/lib/lp/app/tour/translation b/lib/lp/app/tour/translation
index d7f9c88..65261ad 100644
--- a/lib/lp/app/tour/translation
+++ b/lib/lp/app/tour/translation
@@ -111,7 +111,7 @@
111 <a href="community" accesskey="g" tabindex="5" title="Read about mailing lists and teams in Launchpad">Next</a>111 <a href="community" accesskey="g" tabindex="5" title="Read about mailing lists and teams in Launchpad">Next</a>
112 </li>112 </li>
113 <li class="copyright">113 <li class="copyright">
114 &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>114 &copy; 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
115 </li>115 </li>
116 </ul>116 </ul>
117 </div>117 </div>
diff --git a/lib/lp/services/librarianserver/web.py b/lib/lp/services/librarianserver/web.py
index f027cfd..72b83a0 100644
--- a/lib/lp/services/librarianserver/web.py
+++ b/lib/lp/services/librarianserver/web.py
@@ -31,7 +31,7 @@ defaultResource = static.Data(
31 file repository used by31 file repository used by
32 <a href="https://launchpad.net/">Launchpad</a>.32 <a href="https://launchpad.net/">Launchpad</a>.
33 </p>33 </p>
34 <p><small>Copyright 2004-2023 Canonical Ltd.</small></p>34 <p><small>Copyright 2004 Canonical Ltd.</small></p>
35 <!-- kthxbye. -->35 <!-- kthxbye. -->
36 </body></html>36 </body></html>
37 """,37 """,

Subscribers

People subscribed via source and target branches

to status/vote changes: